プラン設定機能追加 #26

SasakiTakatsugu · 2025-10-02T00:47:28Z

No description provided.

Copilot

Pull Request Overview

This PR adds plan configuration functionality to the billing system, introducing endpoints for managing tenant pricing plans and tax rates. The changes enable users to view available pricing plans, tax rates, and current tenant plan information, as well as update tenant plans with reservation capabilities.

Added four new REST endpoints for plan management operations
Introduced UpdateTenantPlanRequest model for plan update requests
Implemented plan reservation functionality using the SaaS SDK's PlanReservation model

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-10-02T00:48:23Z

billing_router.py

+    tax_rate_id: str = None
+    using_next_plan_from: int = None


Use Optional[str] and Optional[int] instead of assigning None as default values. Import Optional from typing module for better type safety and clarity.

Copilot · 2025-10-02T00:48:23Z

billing_router.py

+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Internal server error")


The error message 'Internal server error' is too generic and doesn't provide useful debugging information. Consider logging the actual exception and providing a more specific error message.

Copilot · 2025-10-02T00:48:23Z

billing_router.py

+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Internal server error")


The error message 'Internal server error' is too generic and doesn't provide useful debugging information. Consider logging the actual exception and providing a more specific error message.

Copilot · 2025-10-02T00:48:23Z

billing_router.py

+        )
+
+        # 税率IDが指定されている場合のみ設定
+        if request.tax_rate_id and request.tax_rate_id != "":


The condition request.tax_rate_id and request.tax_rate_id != \"\" can be simplified to just request.tax_rate_id since an empty string is falsy in Python, or use request.tax_rate_id.strip() if you want to handle whitespace-only strings.

Suggested change

if request.tax_rate_id and request.tax_rate_id != "":

if request.tax_rate_id:

Copilot · 2025-10-02T00:48:24Z

billing_router.py

+            plan_reservation.next_plan_tax_rate_id = request.tax_rate_id
+
+        # using_next_plan_fromが指定されている場合のみ設定
+        if request.using_next_plan_from and request.using_next_plan_from > 0:


The condition checks both truthiness and > 0, but since using_next_plan_from is an int, checking > 0 alone would be sufficient and clearer (0 is falsy anyway).

Suggested change

if request.using_next_plan_from and request.using_next_plan_from > 0:

if request.using_next_plan_from > 0:

Copilot · 2025-10-02T00:48:24Z

billing_router.py

+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Failed to update tenant plan")


The error message 'Failed to update tenant plan' is generic and doesn't provide useful debugging information. Consider logging the actual exception and providing more specific error details.

SasakiTakatsugu · 2025-10-02T00:53:03Z

同機能修正

フロント
saasus-platform/implementation-sample-front-react#19

バックエンド
saasus-platform/implementation-sample-api-csharp#3
saasus-platform/implementation-sample-api-php#7
saasus-platform/implementation-sample-api-javascript#7
#26
saasus-platform/implementation-sample-api-go#10

javaのみ未着手

Copilot

Pull Request Overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 8 comments.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-10-23T03:26:48Z

billing_router.py

+    if not auth_user.tenants:
+        raise HTTPException(status_code=400, detail="No tenants found for the user")


The tenant check in get_pricing_plans is unnecessary since pricing plans are not tenant-specific. This endpoint retrieves all available pricing plans in the system, not tenant-specific data. The check should be removed as it incorrectly prevents users without tenants from viewing available plans.

Suggested change

if not auth_user.tenants:

raise HTTPException(status_code=400, detail="No tenants found for the user")

対応しました。

Copilot · 2025-10-23T03:26:48Z

billing_router.py

+    if not auth_user.tenants:
+        raise HTTPException(status_code=400, detail="No tenants found for the user")
+


The tenant check in get_tax_rates is unnecessary since tax rates are not tenant-specific. This endpoint retrieves all available tax rates in the system, not tenant-specific data. The check should be removed as it incorrectly prevents users without tenants from viewing available tax rates.

Suggested change

if not auth_user.tenants:

raise HTTPException(status_code=400, detail="No tenants found for the user")

対応しました。

Copilot · 2025-10-23T03:26:48Z

billing_router.py

+        tax_rates = TaxRateApi(api_client=pricing_api_client).get_tax_rates()
+        return tax_rates.tax_rates
+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Failed to retrieve tax rates")


The error message lacks context about the actual error. Consider including the exception details or a more specific error message to aid in debugging. For example: detail=f\"Failed to retrieve tax rates: {str(e)}\"

Suggested change

raise HTTPException(status_code=500, detail="Failed to retrieve tax rates")

raise HTTPException(status_code=500, detail=f"Failed to retrieve tax rates: {str(e)}")

エラー詳細はprintでコンソール出力、フロントには出さない形式で対応。

Copilot · 2025-10-23T03:26:49Z

billing_router.py

+
+        return response
+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Failed to retrieve tenant detail")


The error message lacks context about the actual error. Consider including the exception details or a more specific error message to aid in debugging. For example: detail=f\"Failed to retrieve tenant detail: {str(e)}\"

Suggested change

raise HTTPException(status_code=500, detail="Failed to retrieve tenant detail")

raise HTTPException(status_code=500, detail=f"Failed to retrieve tenant detail: {str(e)}")

エラー詳細はprintでコンソール出力、フロントには出さない形式で対応。

Copilot · 2025-10-23T03:26:49Z

billing_router.py

+
+        return {"message": "Tenant plan updated successfully"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail="Failed to update tenant plan")


The error message lacks context about the actual error. Consider including the exception details or a more specific error message to aid in debugging. For example: detail=f\"Failed to update tenant plan: {str(e)}\"

Suggested change

raise HTTPException(status_code=500, detail="Failed to update tenant plan")

raise HTTPException(status_code=500, detail=f"Failed to update tenant plan: {str(e)}")

エラー詳細はprintでコンソール出力、フロントには出さない形式で対応。

Copilot · 2025-10-23T03:26:49Z

billing_router.py

+    if not tenant_id:
+        raise HTTPException(status_code=400, detail="tenant_id is required")


This validation is redundant since tenant_id is a required path parameter in the route definition. FastAPI automatically ensures path parameters are present and non-empty, so this check will never trigger and should be removed.

Suggested change

if not tenant_id:

raise HTTPException(status_code=400, detail="tenant_id is required")

対応しました。

Copilot · 2025-10-23T03:26:49Z

billing_router.py

+    if not tenant_id:
+        raise HTTPException(status_code=400, detail="tenant_id is required")


This validation is redundant since tenant_id is a required path parameter in the route definition. FastAPI automatically ensures path parameters are present and non-empty, so this check will never trigger and should be removed.

Suggested change

if not tenant_id:

raise HTTPException(status_code=400, detail="tenant_id is required")

対応しました。

Copilot · 2025-10-23T03:26:50Z

billing_router.py

+        # 税率IDが指定されている場合のみ設定
+        if request.tax_rate_id:


The condition checks for truthiness (if request.tax_rate_id:) which will be False for empty strings, but the comment on line 476 indicates empty strings should be handled. Change to if request.tax_rate_id is not None: to match the behavior of next_plan_id and allow empty strings to be set.

Suggested change

# 税率IDが指定されている場合のみ設定

if request.tax_rate_id:

# 税率IDがNoneでない場合は設定（空文字も含む）

if request.tax_rate_id is not None:

next_plan_idは解除予約で空文字が必要、tax_rate_idは不要のため対応しない。

add-plan-setting-page

fd49363

SasakiTakatsugu requested review from KooriyamaHiroki, bigdragon0610, Copilot and silent-bayline October 2, 2025 00:47

SasakiTakatsugu self-assigned this Oct 2, 2025

Copilot AI reviewed Oct 2, 2025

View reviewed changes

SasakiTakatsugu mentioned this pull request Oct 2, 2025

プラン設定機能追加 saasus-platform/implementation-sample-api-go#10

Merged

UpdateTenantPlanRequestをOptionalフィールドに修正、TypeErrorを解決

26d04af

SasakiTakatsugu mentioned this pull request Oct 7, 2025

プラン設定変更の実装ガイドを追加 Anti-Pattern-Inc/saasus-platform-document#233

Merged

1 task

KooriyamaHiroki requested a review from Copilot October 23, 2025 03:25

Copilot AI reviewed Oct 23, 2025

View reviewed changes

SasakiTakatsugu added 2 commits October 23, 2025 16:07

remove unnecessary tenant checks from master data endpoints

92040eb

remove unnecessary tenant_id checks in path parameters

f2c9715

		except Exception as e:
		raise HTTPException(status_code=500, detail="Internal server error")

	if request.tax_rate_id and request.tax_rate_id != "":
	if request.tax_rate_id:

	if request.using_next_plan_from and request.using_next_plan_from > 0:
	if request.using_next_plan_from > 0:

		if not auth_user.tenants:
		raise HTTPException(status_code=400, detail="No tenants found for the user")

		if not tenant_id:
		raise HTTPException(status_code=400, detail="tenant_id is required")

		# 税率IDが指定されている場合のみ設定
		if request.tax_rate_id:

プラン設定機能追加 #26

Are you sure you want to change the base?

プラン設定機能追加 #26

Uh oh!

Conversation

SasakiTakatsugu commented Oct 2, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 2, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu commented Oct 2, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

SasakiTakatsugu Oct 23, 2025 •

edited

Loading